Merge
authorAlastair Tse <atse@xensource.com>
Fri, 1 Dec 2006 17:42:39 +0000 (17:42 +0000)
committerAlastair Tse <atse@xensource.com>
Fri, 1 Dec 2006 17:42:39 +0000 (17:42 +0000)
commitf83b348cf87ceaccd34771e9448db2fe2788c181
treeb3d4f5aefb38ce36103518071fb72a74f173dbd3
parent0f07569d157834b25a67ff49bf68fb46932a206f
parentcebaab7c6b90391742eafd652c4aebc59f0e9052
Merge